Skip to content

Fix CI for release/v1.21#20166

Merged
RyanTheOptimist merged 5 commits intoenvoyproxy:release/v1.21from
RyanTheOptimist:v1.21-fix_examples
Mar 7, 2022
Merged

Fix CI for release/v1.21#20166
RyanTheOptimist merged 5 commits intoenvoyproxy:release/v1.21from
RyanTheOptimist:v1.21-fix_examples

Conversation

@RyanTheOptimist
Copy link
Copy Markdown
Contributor

@RyanTheOptimist RyanTheOptimist commented Mar 1, 2022

Backport: examples: Fix flask import (#20038)

Signed-off-by: Ryan Northey ryan@synca.io
Signed-off-by: phlax phlax@users.noreply.github.com


Backport: Update com_github_nlohmann_json: v3.10.5 (current: v3.10.4) (#19384)

Signed-off-by: Faseela K faseela.k@est.tech
Signed-off-by: Ryan Hamilton rch@google.com


Backport: build(deps): bump github/codeql-action from 1.1.2 to 1.1.3 (#20107)

Bumps github/codeql-action from 1.1.2 to 1.1.3.

updated-dependencies:

  • dependency-name: github/codeql-action
    dependency-type: direct:production
    update-type: version-update:semver-patch

Signed-off-by: dependabot[bot] support@github.com
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Ryan Hamilton rch@google.com


Backport: ci: not using alpine image in examples (#19805)

Signed-off-by: Lizan Zhou lizan@tetrate.io
Signed-off-by: Ryan Hamilton rch@google.com

examples: Fix flask import (envoyproxy#20038)

* examples: Fix flask import

Signed-off-by: Ryan Northey <ryan@synca.io>

Signed-off-by: phlax <phlax@users.noreply.github.com>
@moderation
Copy link
Copy Markdown
Contributor

Backport #19384 too based on #19371 (comment) ?

…xy#19384)

Signed-off-by: Faseela K faseela.k@est.tech

Fixes envoyproxy#19371

Signed-off-by: Faseela K <faseela.k@est.tech>
Signed-off-by: Ryan Hamilton <rch@google.com>
@RyanTheOptimist RyanTheOptimist changed the title Backport #20038 to release/v1.21 Backport #20038 and #19384 to release/v1.21 Mar 1, 2022
@repokitteh-read-only repokitteh-read-only bot added the deps Approval required for changes to Envoy's external dependencies label Mar 3, 2022
@repokitteh-read-only
Copy link
Copy Markdown

CC @envoyproxy/dependency-shepherds: Your approval is needed for changes made to (bazel/.*repos.*\.bzl)|(bazel/dependency_imports\.bzl)|(api/bazel/.*\.bzl)|(.*/requirements\.txt)|(.*\.patch).
envoyproxy/dependency-shepherds assignee is @mattklein123

🐱

Caused by: #20166 was synchronize by RyanTheOptimist.

see: more, trace.

@RyanTheOptimist RyanTheOptimist changed the title Backport #20038 and #19384 to release/v1.21 Fix CI for release/v1.21 Mar 3, 2022
build(deps): bump github/codeql-action from 1.1.2 to 1.1.3 (envoyproxy#20107)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 1.1.2 to 1.1.3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@d39d5d5...75f07e7)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Signed-off-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Signed-off-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Ryan Hamilton <rch@google.com>
Signed-off-by: Lizan Zhou <lizan@tetrate.io>
Signed-off-by: Ryan Hamilton <rch@google.com>
@RyanTheOptimist
Copy link
Copy Markdown
Contributor Author

@mattklein123 Ok, I think this is ready for review, now that it is passing CI.

Copy link
Copy Markdown
Member

@mattklein123 mattklein123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@repokitteh-read-only repokitteh-read-only bot removed the deps Approval required for changes to Envoy's external dependencies label Mar 4, 2022
Signed-off-by: Ryan Hamilton <rch@google.com>
@RyanTheOptimist RyanTheOptimist merged commit 2f552e8 into envoyproxy:release/v1.21 Mar 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants